Renamed structure to suit inclusion of OWS Context