Move duplicate code to base class+add partnerId to cue point entry index