Added extra columns and validators