#findById -> #find, #rwhere -> #where
also added shorthand #before, #after