This will be implemented as a PageDecorator