Fixed files management
Added delay handler