Use constants for core >=0.16, also updated core dependency

Use constants for core >=0.16, also updated core dependency #85