Improving tagged structs + adding new.