Added query logic (bus, handlers and queries).