Version 3.5 - Modification to support Hosted Services

Resolved ticket #66