Updated to build with maven