Moved more functions to discoutils project