Enhance immutable data API