Use new return type