Changed validation to hide "keys"

Validation source now handled internally