Updated for maven compatibility