Updated findOne methods to return options