Fix: Split finding from creating