Added support for null=True