Add inital remote support