Added Shell script and modified classes