More supported modules

Change-Id: Iec2e6615434e9cf11ee0f5b99c1dc8f0b378c8e2