added support for remaining control types