Add forgotten Avc.hs and some performance improvement