Refactored graphic module