Fixes #46 by adding all listed enumerations to discovery_method

As listed in #46