Moves toward stricter enforcement

Public
In Collection: