Added avatar support, but still does not work because avatar attachment is nil.