Updated files to work with yo