Added computed values mechanism