Added utilities to query mechanism.