Replaced $core usage