Added support for more sets