add Control Types
Merge branch 'control_types'