Added Rectangle and Line