Followed refactor in SocCore.