Added final primitive shapes