Forked for dcs-mobile app