Add more attrs, state and resource_changed