Added the ability to enable and disable built-in and custom types