Notes for type wrapping refactorization