Added Configuration and OS Detection