Updated to include new files