Allowing for null fields