Several files added to make all dynamic