New decorator architecture