Rework Casto command