Added Finder FindOneByOne