Updated commands framework