Updated and added new classes