Set as valid prior to reload
Remove custom #get implementation
Allow matching on name based reload