Added simple finder support