Extract
Add TypeMapping struct