Better terms
Should have components