TODO: Support for context