Added customizable computed function support