Fix #4: Fix widget usage when not using with model