Updated schema; added User and Group controllers