Adding some dependencies. Renaming properly.