Added abbreviates for state/ops based data types