Added features support from modules.