improve findById and update methods