Some more work on the attribute api