Uncommented some class exports that should work now.