Fix class name conflict
Add command line options