modify type handling.