Cleaned up Output API.