Updated and new classes