Refactored internal APIs, unmodifyable are really unmodifiable