Adapted the project to the base library changes.