Implements override policy (breaks retro-compatibility)