Adding the ability to pass in context in constructor