Fine tuning the REST services. Work in progress.