Started work towards the separation of local and remote WPS processing.