Adding a better structure