Change to use resource attributes instead of regular attributes