Revert "Revert "Get even more thing's from HydraCarbon""

This reverts commit 62971294ae5790baa19f75af211221262c42da82.