Added some entities, attributes into tables, services