adding more entities, handlers, daos