Changes for supporting cubitruck