Changed validate keys