* : Small structure changes