Added more options to expand