Updated config and components