Code refactoring (added decorators, new attributes added to the request )