Added findById and deleteById