Moved out type-specific code in functions
0.0.4