Added missing models. Fixed integration of config.