Tables v2

could be a part of entity factory