Reworked decorator strategy