Adding some modified classes