Deleted validation generation
Data type fixes