Renamed core functions