Configuration and main script updates