* Changed from Gradle to Maven
* Fixes after testing Private Services.