Adds basic resolving