Adding initial policy enforcement logic