Add if-let and when-let