Modified in order to support Maven-Central deploy