Add per-SP attribute mapping and allowed attributes