Updated some functions in core