Updated to use *_cat gems instead of *-cat gems