Integrate yeti support and few updates