Switched to different exports structure