Added Configuration and Extension