improve - use export naming replace expose