Added further file support in entry control