+ First pass at moving the resource validation code out to improve performance.