Minor changes (added some user tables)