Completed misc functions of core module