Cologne-AMS specific changes