- Modified service reference
- some fixes