Some optional + wildcard cases work now