Changed approach to type hinting as per Taylors suggestion