Decided to move default entities to units collection: this commit is to freeze in case I need to come back.