Cloning optimisations and introduction of the service parser