Made changes to the structure