Added functionality for Open and Save