[#APOLLO-4034] Added type hint & updated docblocs