Better defaults for handlers