Added EmptyShape and functionality to CompoundShape