Added support for stateless Squares