Updated to make generate files properlly