Add more generic annotations

[mitelg]

Hey there :wave:

My first PR on this project. Please let me know, if I missed something about code style and so on :slightly_smiling_face:

PR #143 was a good start. While working with the newest version, I found some other places, where it would be useful to add generic annotations.

[jakzal]

Thank you @mitelg 🍺