Updated to use Maven