Add support for Yash