Update to split implementation