Incorporate utils from CEP1