Added some dependencies, fix stupid duplication