Issue #64

* ALso fixed a generator service definition issue