Make importing easier. Clean up message types