Added tracking support on triangle and square.