Add find and find_by_ commands