Code refactoring. Add gifts task