Changed name of Class entity and added time attribute