Added support for resolving objects