Remove unnecessary [].  The DSL accepts singular values for plural properties
Merge with adam's changes