Add type-hinting for known object types