#2305759 Added more options
#2305759 Migrate more options