Completed refactor to elysium_buffering_strategy behaviour