Address issue #1 from issue tracker - merge Enable and Address list options.