Improved 'main' entry points