Add server side check