Better support for special libs