Better decoder management.