Added Shape for handling drawing logic.