Refactored class methods