[TIMOB-12937] Fleshed out type definitions