Started support for optional modules