Added shape rendering