Added framework for three new integral types