Improve FileBehavior