Removed old decorator