[INTERNAL] Changes some internal interfaces.