Fixed put resource_name into attributes