Added support for trailing coma