Adding new files with dependencies fixed on callemall