Add more cpf functions