Added StructureMap support