Fixes dependency issues by re-depending on Equipment