Remove implementations and add generators