Added support of standalone widgets