adding support for EOF for demo app