Added basic widget support