Modifed request handlers