Class library changes