Add Lollipop compatibility