Followed refactoring in Arastreju.