Add empty entities
Merge origin/master