added AT government attribute map; + some cosmetics