Reverted the last commit, will add all the classes at once