Updated Type Hinting to work with decorators.