! Std class refactoring