Shock resistance categories, implemented more traits