Class export updates