Smarter maven handling