Making analysis compatible with new infrastructure