Use relevant expressions even for calculated attributes