adding support for stored functions