Changed classes to work with Engine update and added updates