Added possibility for empty value in statement fields