Make compatible with keystone and bump version