Converting resource_name and resource_id to strings and some updates