improve maven support