Some minor changes in tables, refactored factories