Improve situation with types