Change entities, add new table