Applied maven changes