Add additional checks for existing data