Improving common models and tools