[WIP] Add find options