Reorganized default handling