Added more external dependances