updated to latest common components