Added string check on key