Decoration Class updated