Added system module supports