Added new classes in order to get a clean app version