Updated to latest common components