APY-114: Refactor CDM to include content metadata and make it extensible