Added lock screen support