Update wrapper spec to include features discussed in #4