Added _find method
Refactored save function
Refactored _find function