Changes to allow drawing graphs with builder