To fix opt serial bug and rename some class