Improve graphics module