Port more features to ICE.Full