I wonder if that could be achieve via a decorator.