Fix attributes and provider so members output properly