Divided Wrapper into wrap and singleton