Final maven changes