Changed the #{ ... } mechanism to be highly specific and improved options