Moved to using REST adapter and simple-auth