Migrated to follow Simpl implementation