Update for maven build