Begin handler interface refactor and shuffle STM container types