Implement or fix methods for stateless mode