Added finder class