Add support for binstubs