Update key config & include layer config key items