Yeah that's a good idea, I didn't want to if / else / if the callers for derived to check if there was derived data, but you're right I can just fold that info the method and call the regular provides if no derived data is set. Will force push after a unit test run thanks!