Added default handling