Added support for combo