Adding the decorator part