Add Raw type
Restructure