Added core functions