Even more work on mvn integration