Optimized selection
Implemented save operation