Update validation to use interface
Tweak admin fields