Move check to backend