More updates of core functions