Added file version support
updated TODO