Major framework update, work on User/Roles models