Updated application adapter. Updated models