[feature] Additional types added to code.
[documentation] TODOs added to code.