Improve Size Handling