Start to add combo support