Includes new classes