Added computed fields support