Better attribute support