Adding structure, non-functional