Added files missed in previous refactoring commit