Add new files from dev branch