Made backlog handling modular. fix #3