Add core model classes