Missing deps

Implements feature to be used in builder as discussed
In a followup PR, can this module be extracted to it's own file for better re-use?