[46333/46533] More mangos implementation