Updated base::ItemDeclorator to base::Decorator