Added Configuration components