Updates and fix pac support