Grammar and counter words models, dao, services were added