Updates for function with Web Service.

Further optimizations and usability.