Added s-expression support