Replaces header implementation and unit test