Added support for saya machines.