fix(types): improvements to internal types and options parameter

fix(types): improvements to internal types and options parameter #1107