Preliminary changes to Locals Controller and UserSession