Add redirect handling and validators