CF: improved return types