Initial version
Added Environment Detection and Auto-Configuration