Added more auxiliaries and improved auxiliary adding mechanism