Added Rectangle and circle shapes