Updated configuration mechanism