update shape classes
udpate instrument class, downward casting