Moved value computation to server-side