Factor out to dedicated method