AdapterDSS -> DecoratorDSS in FP class