Making finder and resolver methods nicer