Comments ignored, added attributes whitelisting.