BAC-505: change this to context methods