Smaller improvements to backend architecture and implementation
Merge pull request #1 from sirthias/master

Smaller improvements to backend architecture and implementation