Fix for issues #9 #10 #11 #12

Minor refactoring to provide more extension points into bootstrapping