Fixed encoding and added pseudo database