Added type-hinting to methods