Updated according to library changes