Module and Component(WIP!) support moved to policies