OWS reworked using the new build approach.