Added Shape and Rectangle