enhanced the canAdd property dertermination
enhanced the metadata merging