Moved request checks back into Request