Added support for call by need