fixing set method:
-now looks for specified table and not default one
Changed resolve method, again