Enable new modules

Change-Id: I42378e4288e8308316391d95451a501bdf0b23f9