Added better structure