Adding expected_types