ConstClass refactored