Add deep compact support