further changes for Xper adaptation