Context is now separate from declarations