Smarter handling of less dependencies
Mega commit