Use new definitions
Add grid component