Updated typesystem according to sprint1 design.