Made attribute system more robust.