Added support for baikal