Added location table. Fixing username conversion.