Refactored methods for consistency