Resolving more entities, working on constraints