add_catch_all_partition
sperate classes