Added special case of Library