Service is not a singleton by default anymore
Tweak RDOC