Improving TypeDefs and Properties

Signed-off-by: Tom Greever <anybody@tomgreever.com>