Modified to Maven Project