Made some classes stateless