Make components use proper models