(Existing library with new features)