Changed routing
Fixed problems with ORM and Resource names