Added all current exported functions