Handle more cases