Refactored for consistency