Add core functions needed