Redesign type handling

Removed getType