Better handling of code using CPP
hsimport 0.2.5