Added file attaching and removing