Added panel and control types