Cards - Performances improvements