Added types and calls to the new positioning formulas.