Added support for trailing comma