Added trayer support