More maven conversion