Validation added for FD and Primary Key

Signed-off-by: Benjamin <benchisa@gmail.com>