Separate default handlers for extensibility