Added type mapping framework

#22