Updated to ARC, added basic Entity management and extended user management