Changed name of WrapperListener and removed Wrapper. Updated impelemtations accordingly