Added back geometric funtion support.