Some improvements
check for files existence