Working on better compression handling