Some changes to handle multimedia content fields
Updated