Added drawing of custom shapes