Moved configuration and changed xml