Add proper custom types to variables