Modifications for widget library