Added newest schema, small TMS updates