Added decorator and extra request variable