Modifs architecture + auth
Change-Id: I1e66b88059d7d7de21b4eadf0498fbba1e32d8fd