Add more exports