Handling Improvements, structural changes in patch