Added shape features