Upgraded to Maven project