Added ability to work with diff file tpes