+ some more modifications for sonatype