Add support for lower and upper functions