Added infrastructure feature. Light code changes.