Updated user model and new organisations model