Basic support for Custom Tables, as well as other minor updates.