Improve Maven configuration