more changes to attributes class