FIX type hinting