Adding Faceoff and polishing editCollection