Refactored handlers