Adding 2 source files missed in previous commit