Added support for credentials field to output