Fixes in archetype. Added Caller example (still work in progress)