File creation and removal added