Added validation for existing entry's