Added shape drawing