Updated for better maven compatibility