Add orElse() + fix type bound for map()