Got rid of tables (moved to another project). Added international character support