add hybrid support