Added context feature for on and one methods
Fixed conflicts