Put more functions into addons