Changed return value format.