TimeExpressions layer updated to meet standard NAF specifications