Make package more go friendly