Revert "Remove few things"

This reverts commit 7397de60e819b294eb65c6c0db9279ccbcd396b6.