Changes to user and Table schema