Switched to using new Output API.