Remove unclear resolver
Rename Handler Contract
Merge branch 'develop'