Added Box support.