Impliment resolver functionality

Change-Id: Ie9d9a87f789f0267c9257c8100c25a4eae048070