added support for discover; volume. etc.