Conform more closely to standard / add request logic