Added validation and updated tables.