*8235* Additional abstraction