Removed ctxt wrappers plus some updates after Mark's feedback