Moved --expand outlines option to new feature structure