New strcuture for V2 with Manager