Switched to Session for all API calls and added asContext + tests