Renaming classes, fixed crypto length bug, and added table metadata