Added square and rectangle