Fixing Dependencies and adding Wrapper Archetype