Cleaner decoration code
Call it an add-in but a plug-in :)