File Entity + Media updates