More validation. Removing direct use of string, accessing using resource string