Switched to using allowEmpty and allowNull properties