Added validations and upd backfill