Moved resource attributes to table