Make changes for Xitrum 2