Maven improvments