Added enum for request attribute names and all in-code attribute names replaced with constants