Added new classes and fixed animation bug