Fix #1, fix #2 - Adding Backlog support