Added support for Bishop