Updated the shape management.