Normalizing CP + adding deployment assembly