remove Collection cause not need
Merge remote-tracking branch 'origin/master'
Metadata moved to entity