Use X-Bus for now, until we find a way to make this configurable