Deal with types properly