Refactoring - shifting some code to the context class