Updated Typesystem