Partial changes for sessions loading