Changed context extensions to use object instead of strings as values