Replaced lib, fixed fields