Removed dependency over widgets module