Definitely should have been part of the implementation in the first place.