Improved logging and avoid loosing typeArgMaps, when manufacturing attributes