Added extra type hint to self-type ni order to help IDEs analyze the code