Add splitting and searching options