Added wrappers for new targets table.