Added "change type" functionality