Fixing how we handled after calls
Better API - internalize all the options into internal metadata