Added support for scalar attributes