Updated to use maven 3