Cleanup
Added more operations