Fixed issues with duplicate modules and dependencies