added dropdown and support for enabling/disabling