[FIX] Pass interface to handlers rather than this