Added panel support