add multiple type options
Merge branch 'apidev2'