Re-working attribute repository