Feature/modularity dependency