Better graphics encapsulation