Cleanup option type code and add more types

Signed-off-by: Hao Liu <hliu@redhat.com>
Merge pull request #9 from Hao-Liu/opt_type_data

Cleanup option type code and add more types