Imported more functions for old interface