Made locks database to generic world database