Updated to include more fields (main one is media entities)