Added some class based on new design