Move some function to modules