Refactored old bpm/document behaviour