Added local and remote scope