Added basic support for remaining controls.