Added validation of particular part of string