[master] simplify subclassing; initial decorators setup