Added a lot of maven magic