Added new files missed in previous commit