Draw methods now returns a reference to the shape