add new functionallity for resolver