Added async media support