Stateless improvements