CustomCommand structs removed, replaced with object[]