Better handling of Type