Full saving functionality added