Added tables for entities