Added Circle and Square