Add zway support