Add support for remaining sets.