Added new files, modified expose