Added polygon shape support. Added ID support for shapes.