Needs to be updated for 2.0-M2 table definitions