Added more context methods