Updated all User layer classes to use new context class