Code updates to maven