Improve maven build