Changed keyword keys location