minor fix
fixed tabs
Implemented find and save method with cluster support