Making context convenience methods more consistent, removing unnecessary/redundand methods