Adding either type and module and updated control exception module to now use either type.