Added developer mode switch