Adding maven improvement from kpiwko