Added basic implementation of Resolve method