Add conservativeCollapse option