Added support for SingularAttributes.