Eliminate Decoration class and use plain objects instead