Updated files for dynamic use