Make resolve methods more DRY through inheritance