Removed 'device' from all content data code since it is a 1:1 relationship with the full path