Adding Core Engine classes