Added custom gridTemplate support