Start of defining types -
small updates