Re-structured types