Added more settings fields