Updated locking, table prefixes