Add method Find and FindOneById and fix errors