Add resolve
2.2.0