Now supports non developer mode