Readd soft dependencies