Add in random control types