Dirty hack of needed modules

Change-Id: I37af9bae44139616c0b549a0061196d49a69d4cf