Removing unique constraint on action value and fix make_dict functions