M112 - Includes count in method signature

- Changes the return type for discovery to be a dictionary. This way we can include metadata information about the result set and it's scalable to include more if need be.
- Adds count to the method signatures.