Changed return structure.