Convert more parts of the enforce engine