Added rest parts of the project