Valama: Moving GDL stuff to widget