Added shape drawer