Code Review for the classes changes