Use types itselfs instead of string representations