Wrong logic
Improvements to feature dependencies

Renamed method that support OR logic
Removed embedded diagnostics is favour of future separate diagnostics