Add forgotten options concerning charset definition