SM: Updated configuration