Updated ORM with find method