Added user table and updated methods