Added filling of shapes