Made some changes to maven to allow for upcoming features