We revamped the internal codes to support the new framework