Adjust endpoints with new validation and helper functions