Revert "remove unnecessary entities"

This reverts commit 8cf0e457ffb1a941949eafcf1cb75ebcf6604966.