Improved maven configuration