Switched to maven