Update to stateless controlls