Added support for at-expressions to validator