Migrate to using Sentinel package