Adding core model classes