More model classes implemented