Improved DrawManager