Change to use fetch contents data