Last steps in module features