Added more settings