Changes made to use structurmap