Fixing some bugs and adding support for service properties