Better default value handling

Enable array based default value handling